Working on getting expansion working for search