Fix for viewing building on navigation from Classes page