Improve layer search