Added conversion to long for id search