Fixing Some Splitting issues and changes in .hql file ----- committed by
Charan Adabala