Changed model find method calls to use query method