moved new logic to seperated method
performance change in getWAMSubpageUrl() method
removed unnecessary method