added teh category filtering
fixed the merge from server
added category filtering