filter issue and category issue resolved
fixed conflicts