Fix import controller
Fix mr index_spec
more fixes