improvements in classes from the Query hierarchy
added an observable query class