More consistent and less redundant handling of bigg ids