Source manager, filter, map update logic fixed