Feature/idx-query-parser