deleted unnecessary code, changed query in order to contain optional
clause
changed query to contain optional clause
minor changes
query changed
changed query implementations