I would vote for this as well (but Epic is never going to see this or do anything about it, it seems).
I have to do a silly dance with Map Find and Map Add now too…
