Added the ability to set the defType via @Query
Added the ablitiy to wrap multiple query criteria in quotes