CAINT-1350 Fixed incorrect bean scopes.
CAINT-1351 Changed indexed parameter from enum to String to fix query sort order form.
Merge branch 'CAINT-1350' into develop