Added ar_ with hint. Refactored query UI and query types.