Filter refs on fetch for issue #33