rework filter functionality, code cleanup, add maps