Added animations between views/filters, simplified Query service