several fixes for collection-path