Updates to type identifiers
Cleanup in query proc
Improving efficiency of query processor