CRM-13973 : comment #comment-59922

fixes done for things mentioned in https://issues.civicrm.org/jira/browse/CRM-13973?focusedCommentId=59922#comment-59922