Fix return Last Inserted Id on custom insert operations
Fix invalid where when specified a where using CustomSqlQuery annotation