Removed the need for prefixes in query.