Angular filters

merging filers with edit search and location working.