Improve jQuery calls

Followup to I21e911559f19ab06f84a634790285a78776d1ab3 .

Change-Id: I02abb78549842757d56883b568a33bfb5f97700a