Add notations and fix to search