minor fixes to bookshelf queries, removed unnecessary knex import