Added hover state and current state to query menu items.