Added ability for more specific queries (just testing)