Feed finding bug fixes

fixes #47
fixes #48