Bug Fix

Fix sort and search for blank data