Fixed controller choice and added action filter to populate common data between controllers