bug fixes on contact module