refactor spring bundle search