Fixed up searching & filtering