started filtering functionality on index
merged work