UI Tweaks. Changes to query