Changed the ControllerService

Also put a restriction of the number of characters in the aliasField
Resolved merge errors