Improved UI/Labels for advanced filter