Fixed filter removal yet again (moved to actionlistener in tab links)
Cleaned up load functions