Add query and query validation again (Now with .gitignore updated)