Remove query options validator and fixes

Fix some bugs, remove query options validator.