refactoring of query module
move comparasion operators to separate file
clean tests