Removed redundant names suffixes of favourites store methods
Improved method for checking if fav is already in
refs #1168