I created a mailimap_search_key_xgm_new, and left mailimap_search_key_new the same as it was, if you want I could create a third mailimap_search_key_all that takes every parameter and the first two methods call the all, but wasn't sure if you thought that was necessary or not.