Added new parameter to allow only specific queries to run