updated filter placeholder to show correct object name & some code cleanup