Added map filtering to the table