remove elemSubpage logic & some other minor changes