Change locators to a restful interface.

Don't use ; @ and # as separators.

https://edx-wiki.atlassian.net/browse/STUD-602