Added missed return statements + corrected invalid array key
Merge branch 'develop' into feature/baseurl