Added a hack to fix the end date search issue ..