HR-154 - reimplemented validation based on remote

@2j2e