Removed popup from filterbuilder panel, changed to warning label and enable/disable save button appropriately. Also some comment changes.