Updated filtering approach. Moved queryong into the model scope