added hack in order to filter by author and origin name, not id