Fix remaining issues with mousequery