Added verify site parameter and fix

Change-Id: I4648a2bc0c0a6ce93ee05ec11c0a5303204bfaab