removed sykomon specific stuff and fixed filtering criteria