Follow up to consider minimum search char GP and fixed a few minor bugs - RA-199