Bug fix when using maximum 1 entity picker config