Also, if the OP hasn't already flown, Changi often does seemingly random but not so random checks on any flight coming from Indonesia, which can take a bit more time.
Funnily, in retaliation, Jakarta started to do the same checks for passengers arriving from Singapore...