Added extra block for checking  queries
Added more stable dotSyntax handling and support for / queries