Cleans up and puts in stop-gap fix for findAll and findQuery. Logs queries being made.