Fix bug using separate white lists (search & sort)

Fix bug using separate white lists (search & sort): 1) could not sort by a field that is a sort fielf and not a search field, 2) can order by a search field that is not a sort field.

Waiting for feedback.