Improved Query Options

Improved query options view. With all the query options broken up and grouped more appropriately.