Cleaned up Search Layer