Improve layer and feature search