Towards Annotation-Based Query and Document Expansion for Image Retrieval