Files folders limits on XDJ-RX2 question

I am trying to understand the file size limit. I believe it was capped at 10,000 songs on the original RX, but the manual for the RX2 says 10,000 songs per folder. Does that mean if I have 20,000 songs, I could just put them in 2 folders on a USB stick and the RX2 would work with all of them? If so, would the qwerty keyboard search access both folders at the same time?