fixed up the rest of the new query and filtering logic. fixed icon display.