Fix controller matching, move to [] array syntax