Some misc fixes in query-parser
Added websockets proto