Refactor Selector Parser

- Combine with and without options parse_selector function
into one handler.

- Remove unnecessary options future code.
33294-query-text-search