Code format and fix for lookup uri.
Merge pull request #369 from square/dimitris/more-fixes

Code format and fix for lookup uri.