Fixed parsing issues

Bugs: Still needs to correctly search and authorize user