Failed the implementation of contact suggestion - re-factor!

Signed-off-by: svenake <svenake@gmail.com>