Yea, I notice the relevant fixes have now been merged. Thanks to every one involved. Maybe I'm the only Rockbox user to benefit from this, but it seems to be fully working now (once I manage to coax the database into the cache - can usually manage to make it happen by faffing about with the database build, and shutting down/starting up a few times, but have yet to figure out what exactly it is that persuades it to finally load)