Move find method to query module