Changes from query string to Criteria and removes extra implementation.
Merge commit '9a9d31f407497986f6706121df6523e5040c2f2d' into HEAD