controller match + fixing routes