Fixed variables to project in decomposer
New grammar rule in query parsers