US-537 in progress. SQL fix
US-537 in progress. SQL fix

FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup,FriendSoftwareLabs/friendup