Add proper user filtering from index page.