add filter to map with $watchGroup, rearrange format for readability