Changed Query to have backward comp. syntax

Query(criteria, options, model, collection) now