Fixed query service as a result of the refactoring done to query - but also, query now deals with any property changes properly, data coming from the server is in fact set to the observable