fixed last week

fixed last week's issues. This commit includes search filter.