Fixes for Comment and MapSearch