Added normalized query