Add neotoma
Working query parser