Restructure pattern QueryParser and Test #41