Search form workaround