Updated search to allow searching for a feature that is not in the request layer

update to date with master