Made Query an ActiveModel