add similar_query field
refactoring