Showing unpublished/published and handling filters better