added filter and maps