Fixed the two bugs reported on Sunday.
Merge branch 'master' of https://github.com/rajeshjrl/geonecta.git