Add author filter, clean up